Merge from trunk
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 9 Sep 2011 04:24:15 +0000 (21:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 9 Sep 2011 04:24:15 +0000 (21:24 -0700)
commitd5b1f538cf688fb0535e505d5ceac8b86781a99c
treec28e82a807bf7c0299dee6054689495d25737f3b
parentc5853e72c4ceb1648ecbc21add75fb10263582b4
parent6a1a21afa94dd15d5774289aaab7bfbff55e14d1
Merge from trunk